318b23097b
Previous patch avoided initialization of proxies before merging, mainly to fix a bug with merging. However, later on, doctrine tries again to load the proxy. This is unnecessary and thus has been removed. This way, a round trip to the database is saved.