Bug 951337
Merge pull request #2061 from danmcp/master

Bug 951337