Merge pull request #983 from reactjs/sync-55986965

Merge pull request #983 from reactjs/sync-55986965 #1743