fix
Merge branch 'payments' of github.com:imagecms/ImageCMS into payments