Merge pull request #60 from reactjs/sync-4c91abc7

Merge pull request #60 from reactjs/sync-4c91abc7 #186