Merge pull request #4908 from br101/horst