sync from fb codebase
Merge pull request #22 from facebook/sync

sync from fb codebase