Merge pull request #4777 from NagaseKouichi/master