Merge pull request #148 from reactjs/sync-55986965

Merge pull request #148 from reactjs/sync-55986965 #277