Merge pull request #95 from reactjs/sync-2571aee6

Merge pull request #95 from reactjs/sync-2571aee6 #307