rails/rails — pull request #15301 by zzak (2014-05-24 20:26:28+00:00)
Title: Skip if the association was already loaded.

This tries to fix #15212 but needs a test.

With this patch I was unable to reproduce the bug.

cc @tenderlove