Don't set unparseable cookies
Merge branch 'master' into pr/544
Improved readbility of the conditional