Merge from 1.7.9

Merged from here:
https://github.com/sequelize/sequelize/tree/1.7.0