Merge branch 'master' into rempt/T379-resource-management
Conflicts:
libs/brush/kis_brushes_pipe.h
libs/ui/KisDocument.cpp
libs/ui/KisDocument.h
libs/widgets/KoResourceItemDelegate.cpp
plugins/dockers/palettedocker/palettedocker_dock.cpp
plugins/dockers/palettedocker/palettedocker_dock.h
plugins/paintops/libpaintop/kis_brush_chooser.cpp