Merge pull request #2304 from ryu0/master