Merge pull request #208 from reactjs/sync-40ea071c

Merge pull request #208 from reactjs/sync-40ea071c #425