Merge branch 'master' into develop
case 2058 - Bookmark nojs/ajax refactor. Update the login box after action has been done.
Merge branch 'case-2058' into develop
Merge remote-tracking branch 'origin/develop'