Merge pull request #342 from reactjs/sync-55986965

Merge pull request #342 from reactjs/sync-55986965 #309