Bug #6252
Merge pull request #211 from apatel/master

Bug #6252