Bug 990948
Merge pull request #3263 from danmcp/master

Bug 990948