Store server in a cookie.
Merge branch 'master' into gh-pages