Merge pull request #95 from reactjs/sync-55986965

Merge pull request #95 from reactjs/sync-55986965 #307