Merge pull request #385 from reactjs/sync-2a2e02f1

Merge pull request #385 from reactjs/sync-2a2e02f1 #177