P11.04 merged master

https://jenkins.catrob.at/view/All-Categories/view/Paintroid/job/Paintroid-custom-branch-test/982/