Bug 969756.  r=cam a=abillings