Merge branch 'master' into milestones/2.0.0
Merge branch 'milestones/2.0.0' of github.com:sequelize/sequelize into milestones/2.0.0