Logout without ajax in case a different theme is needed.
Merge branch 'master' into MNF

* master:
  Logout without ajax in case a different theme is needed.