Fix a crash when dropping objects without a collision shape
Merge remote-tracking branch 'scrawl/master' into next