Merge branch 'master' into compile_with_qt5