Merge branch 'develop'
No more drops on DM spawns.