#2 Fix wrong cookie setup.
Merge branch 'hotfix/0.6.3'