Merge pull request #132 from reactjs/sync-e22544e6

Merge pull request #132 from reactjs/sync-e22544e6 #219