fixes for new water zorder
Merge branch 'master' of github.com:frogatto/frogatto