Merge branch 'hotfix/1.1.5'
Merge pull request #1 from Krypthonite/master

Enhance phpmyadmin vhost
Merge branch 'upstream/master' into develop