Diffusion Krita 67f4e5a21f87

Merge branch 'master' into krita-testing-wolthera

Authored by woltherav on Jun 23 2016, 8:00 PM.