Bug #8140
Merge pull request #54 from apatel/master

Bug #8140