Merge branch 'master' into Drop_QWT5_and_more_qt4_parts

3 jobs for Drop_QWT5_and_more_qt4_parts in 49 minutes and 38 seconds (queued for 1 second)