Merge "Adding photoshop blend modes to the GFX API" into devel/master