Bug 917163
Merge pull request #1543 from danmcp/master

Bug 917163