Merge pull request #515 from clarkorz/fix-populate-3more

Fix populating more than 2 associations with criteria
Merge remote-tracking branch 'upstream/master'