Merge pull request #162 from reactjs/sync-3ee3a60a

Merge pull request #162 from reactjs/sync-3ee3a60a #298