Merge branch 'master' of github.com:sequelize/sequelize