Solves https://github.com/balderdashy/sails/issues/1206#issuecomment-36833091
Merge branch 'master' of github.com:balderdashy/sails