Bug 928142 [merge]