Merge pull request #5977 from danielkucera/patch-1