* FIX: Object appeared from thin air
Merge branch 'master' into debug