Merge branch 'master' of github.com:topiaruss/cmsplugin-imagesift