* commit '5d3f8599590026d6fc275739613fe6ddb180af55': Merge multi-user stuff from prototype into framework.