Merge pull request #5039 from CEikermann/patch-1