Bug 6358 - Fix merge parents