Apply pull request 1318
Merge branch 'master' of github.com:treasure-data/presto