Bug 960378 [merge]