Merge pull request #1167 from fzs/secureCookies

Secure cookies