Bug 927555 [merge]