Merge branch 'master' into animation-pentikainen
Conflicts:
krita/pics/svg/svg-icons.qrc
libs/image/kis_base_node.h
libs/image/kis_image_config.cpp
libs/image/kis_image_config.h
libs/ui/KisDocument.cpp
plugins/dockers/animation/onion_skins_docker.ui