Merge pull request #229 from reactjs/sync-47e64bf7

Merge pull request #229 from reactjs/sync-47e64bf7 #433