Merge pull request #5999 from tohojo/master