Merge pull request #1 from facebook/master

merge from facebook/presto