Fix cookie value equality
Merge branch 'master' into live