Merge pull request #616 from reactjs/sync-fc296034

Merge pull request #616 from reactjs/sync-fc296034 #573