Merge pull request #53 from reactjs/sync-9967ded3

Merge pull request #53 from reactjs/sync-9967ded3 #172