Bug 921902 [merge]