Merge branch 'master' of github.com:imagecms/ImageCMS into template
Merge branch 'template' of github.com:imagecms/ImageCMS into template
fix
fix
fix
Merge remote-tracking branch 'origin/template'