Merge pull request #168 from reactjs/sync-d52b3ec7

Merge pull request #168 from reactjs/sync-d52b3ec7 #312