Merge pull request #2647 from ry4000/master