Bug 901444
Merge pull request #1168 from danmcp/master

Bug 901444