Bug 949817
Merge pull request #1972 from danmcp/master

Bug 949817