Fold in https://github.com/balderdashy/waterline/commit/8b22c1131f139351acf64d46372f1b0ef0a09ea7 and https://github.com/balderdashy/waterline/commit/bf2c64151900fb3caffd9d4a9b108807438d3fc0
Fold in https://github.com/balderdashy/waterline/commit/8b22c1131f139351acf64d46372f1b0ef0a09ea7 and https://github.com/balderdashy/waterline/commit/bf2c64151900fb3caffd9d4a9b108807438d3fc0

balderdashy/waterline,luislobo/waterline