Merge branch 'reintegrate-upstream' of ssh://github.com/RomanHargrave/Doomsday-Engine into cmake-build
Merge branch 'reintegrate-upstream' of ssh://github.com/RomanHargrave/Doomsday-Engine into cmake-build