Bug #8364
Merge pull request #60 from apatel/master

Bug #8364