Bug 960378 960458
Merge pull request #2371 from bdecoste/master

Bug 960378 960458 [merge]