Bug 912798
Merge pull request #1410 from danmcp/master

Bug 912798