Merge pull request #684 from reactjs/sync-55a317d4

Merge pull request #684 from reactjs/sync-55a317d4 #737