Merge pull request #421 from reactjs/sync-5138e605

Merge pull request #421 from reactjs/sync-5138e605 #258