Merge pull request #527 from reactjs/sync-2c7798dc

Merge pull request #527 from reactjs/sync-2c7798dc #362