05_06_13_3
Merge branch 'development' of github.com:imagecms/ImageCMS into development
Merge branch 'RC' of github.com:imagecms/ImageCMS into development
05_06_13_4