Bug 960291 [merge]