Merge branch 'master' of github.com:naro/Products.ImageEditor