Fix logout - Logs all users out when you logout.
automerge: 9415706

* commit '9415706321faf9352f0106f3062969dbb4bf6b8e':
  Fix logout - Logs all users out when you logout.