Merge branch 'GLundh-authuser-support'