Merge pull request #100 from reactjs/sync-c0c955ed

Merge pull request #100 from reactjs/sync-c0c955ed #312