Merge pull request #89 from reactjs/sync-fc296034

Merge pull request #89 from reactjs/sync-fc296034 #244