[plugin:Watermark] fix PNG blending
Merge branch '2.1' into 2.1_n