Fix cookie bugs.
Merge branch 'development' into gh-pages

* development:
  Fix cookie bugs.