Merge pull request #3616 from tamland/cookiefix