More Complete Version of Terrain
Merge remote-tracking branch 'origin/terrain'