Don't load association collection until needed
Merge pull request #820 from blakink/master

Don't load association collection until needed