Merge remote-tracking branch 'origin' into frameworks
Conflicts:
krita/plugins/paintops/libpaintop/kis_brush_chooser.cpp
libs/koreport/wrtembed/KoReportDesigner.cpp
plugins/reporting/chart/koreport_chartplugin.desktop
plugins/reporting/web/koreport_webplugin.desktop