Merge remote-tracking branch 'upstream/dev' into 'origin/Beds'.

Conflicts:
  maps/exodus-1.dmm