Rebases the rest of https://github.com/balderdashy/sails/pull/890    aka #890