Fixes #151.
Merge branch 'bugfix/thirstWaterSpam' into develop