Merge branch 'fix-Qt5-windows-build' into release