[ci skip] Prevent redifinition of promise lint error
[ci skip] Missing comma in jshintrc ...
Explictly check that an association is a hasMany before trying to pair it in hasMany. Inspired by #2159
[ci skip] Mention fieldName for foreignKey in associations
Merge remote-tracking branch 'upstream/master'