Merge branch 'master' into autostr-and-garbage
Conflicts: doomsday/engine/portable/include/dd_zone.h
Merge branch 'master' into autostr-and-garbage
Conflicts:
doomsday/engine/portable/include/dd_zone.h