Merge pull request #600 from reactjs/sync-abe931a8

Merge pull request #600 from reactjs/sync-abe931a8 #527