Fix lake/river level and gleam to ray advance
Merge remote-tracking branch 'origin/master'