Merge branch 'master' into develop
Merge branch 'hotfix' into develop
Merge branch 'hotfix' into develop
Case 3193 - Fixed notices when logging in with Openruth.
Merge branch 'case-3193' into develop

* case-3193:
  Case 3193 - Fixed notices when logging in with Openruth.
Merge branch 'develop'