Bug 1032789 (Merge)