Add a 10km x 10 km water plane
Merge remote-tracking branch 'origin/master'