Closes https://github.com/balderdashy/sails/issues/1206