Merge branch 'master' into develop
Merge branch 'develop'
Merge branch 'master' of https://github.com/iCodr8/contao-photoalbums2