Bug 928966: port bug 926906 to comm-central, r=Standard8 CLOSED TREE