Merge pull request #225 from reactjs/sync-1207ee36

Merge pull request #225 from reactjs/sync-1207ee36 #409