Rebase https://github.com/balderdashy/sails/commit/90ec9183461ac1a6d17e907054ab7be0fe82104e