Fix cookie path #712
Merge branch 'master' into production