am 0fd909ba: am d65afc65: Merge "More multi-user stuff." into jb-mr1-dev

* commit '0fd909bad1151cc39061abb52ae5b8be090e05dd':
  More multi-user stuff.