Cookie policy cookie expires after a year
Merge branch 'master' into production