debugging weird map when logout/re-login
Merge branch 'master' into gh-pages