Merge pull request #5855 from plappermaul/master