fix N:M self associations with foreign keys and through models
Merge branch 'master' of github.com:sequelize/sequelize