Adjusting water removing above unloaded blocks
Merge remote-tracking branch 'upstream/master' into oreup