Bug 906840
Merge pull request #1581 from bdecoste/master

Bug 906840 [merge]