Bug 996616
Merge pull request #6 from danmcp/master

Bug 996616