Merge pull request #607 from reactjs/sync-55986965

Merge pull request #607 from reactjs/sync-55986965 #486