Bug 835778
Merge pull request #2210 from danmcp/master

Bug 835778