fix
pull from OScolors
Merge branch 'OScolors' of github.com:imagecms/ImageCMS into development
pull from OScolors
pull from OScolors