Merge remote-tracking branch 'origin/master' into libgui-audio
Conflicts: doomsday/libdeng2/include/de/data/reader.h doomsday/libdeng2/src/data/reader.cpp
Merge remote-tracking branch 'origin/master' into libgui-audio
Conflicts:
doomsday/libdeng2/include/de/data/reader.h
doomsday/libdeng2/src/data/reader.cpp