Fix for Oasis altar and added water.
Merge remote-tracking branch 'origin/master'