Fix for compound association edge case
Merge pull request #296 from shenrie/master

Fix for compound association edge case