Bug 947016
Merge pull request #1891 from bdecoste/master

Bug 947016 [merge]