Merge branch 'master' into pentikainen/T5805-reference-images
- Conflicts:
- libs/ui/kis_painting_assistant.cc
- libs/ui/kis_painting_assistants_decoration.h
- plugins/assistants/Assistants/ConcentricEllipseAssistant.cc
- plugins/assistants/Assistants/kis_assistant_tool.cc