Fix for Qt5 in plugins that use matplotlib
Merge remote-tracking branch 'origin/master'