Merge remote-tracking branch 'remotes/origin/master' into savegame-refactor
Conflicts:doomsday/libdeng2/game.pri
Merge remote-tracking branch 'remotes/origin/master' into savegame-refactor
Conflicts:
doomsday/libdeng2/game.pri