Merge pull request #685 from reactjs/sync-a1cc2ab4

Merge pull request #685 from reactjs/sync-a1cc2ab4 #739