Spit a warning message if world is empty, do not add ground if that happens
Merge branch 'master', remote-tracking branch 'origin'
Merge branch 'master' into shape-refactoring-option2