Merge from facebook/master

update