Bug 947092
Merge pull request #1943 from bdecoste/master

Bug 947092 [merge]