Bug 947092 [merge]