Bug 927555
Merge pull request #1830 from bdecoste/master

Bug 927555 [merge]