Merge pull request #5423 from jow-/master