Merge pull request #3615 from kloun/patch-8