Bug 906845 [merge]