fix has_many, with children items
Merge remote-tracking branch 'origin/master'