Bug 883944
Merge pull request #1917 from bdecoste/master

Bug 883944 [merge]