More cookie stuff, not sure how to make it work the way I want.
Merge branch 'dev' of https://github.com/Venture-TheSphinxTeam/Sphinx.git into dev