Merge pull request #136 from reactjs/sync-6326e7b1

Merge pull request #136 from reactjs/sync-6326e7b1 #260