Improved handling of scrims to prevent accidentially canceling composing
Merge branch 'master' of github.com:minego/macaw-enyo