Merge pull request #473 from reactjs/sync-3ee3a60a

Merge pull request #473 from reactjs/sync-3ee3a60a #253