Merge pull request #200 from reactjs/sync-27d86ffe

Merge pull request #200 from reactjs/sync-27d86ffe #721