Bug 1004697 - mergeable