Merge branch 'master' into rpauth2