Mohammed Nafees 341c335f1c Merge branch 'master' into belanger/api-tokens-refactor-2 %!s(int64=4) %!d(string=hai) anos
..
sessionstore b765728130 add option to make cookie insecure %!s(int64=4) %!d(string=hai) anos
token a1956e9782 fix merge conflicts %!s(int64=4) %!d(string=hai) anos