Merge branch 'release-1.1.0' into dev
path names in login.php prevented includes
Merge branch 'hotfix-1.1.1'