HEAD backport: Adds checks to make sure that the multiple user problem is really gone (gage)
Changed paths: