Merge pull request #6760 from ferama/master