Merge pull request #6132 from alarig/master