Bug 947016 [merge]