Merged upstream/dev into origin/beds.

conflicts:
  maps/exodus-1.dmm