Fixed bug where child entities where not cleaned up correctly
Merge remote-tracking branch 'origin/master'