bug fix
Merge branch 'master' of github.com:imagecms/ImageCMS into userstory77
old 1c fix
Merge branch 'master' of github.com:imagecms/ImageCMS into userstory77