fix cookie domain for production
Merge remote-tracking branch 'upstream/master'