29dc496a
* commit '29dc496a42d49a37dcd99c0465f3cec18a47e6ff': Revert "Add a way to override Xfermode DO NOT MERGE"