Bug 918480
Merge pull request #1564 from danmcp/master

Bug 918480