Merge remote-tracking branch 'origin/BUGFIX/qt-4.8.5'