Diffusion Krita 20083198a389

Fix merge error

Authored by rempt on Mar 14 2018, 2:03 PM.