pre-build fixes;
Merge branch 'master' of github.com:imagecms/ImageCMS
Merge branch 'master' of github.com:imagecms/ImageCMS
merge
pre-release