Compiles on Linux
Merge branch 'refactoring/qt5' into next