Merge pull request #101 from reactjs/sync-c0c955ed

Merge pull request #101 from reactjs/sync-c0c955ed #318