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