Merge branch 'master' into develop
case 2071 - Add HTTPS support for ajax login form and for session storage.
Merge branch 'case-2071' into develop
Merge remote-tracking branch 'origin/develop'