Merge 2.5.2#2474

addaleax merged 2 commits intomainmongodb-js/mongosh:mainfrom

merge-2.5.2mongodb-js/mongosh:merge-2.5.2Copy head branch name to clipboard