Restore rendering order water areas

This resolves #943.
Merge pull request #976 from math1985/water-order

Restore rendering order water areas