Merge pull request #4898 from br101/horst