Rebase for 15ebeea2270f58e4f83fcf622a7c51ae5c921173 in https://github.com/balderdashy/sails/pull/444