Removed terrain_generation from branch master