Merge pull request #154 from reactjs/sync-55986965

Merge pull request #154 from reactjs/sync-55986965 #310