Merge remote-tracking branch 'origin/master' into oculus-refactor
Conflicts: doomsday/client/src/ui/widgetactions.cpp
Merge remote-tracking branch 'origin/master' into oculus-refactor
Conflicts:
doomsday/client/src/ui/widgetactions.cpp