Merge pull request #6372 from raphaelm/patch-1