Merge pull request #5246 from wvdakker/master