Rebase onto sequelize master and reflect MySQL query generator refactoring there