Merge pull request #58 from reactjs/sync-53fbed3f

Merge pull request #58 from reactjs/sync-53fbed3f #182