Merge pull request #4965 from lucize/doveup