redmine issue #5949
Merge branch 'master' into pinauthintegration