Rebases https://github.com/balderdashy/sails/pull/1228