merging from facebook:master