Bug 928701 [merge]