Merge changes from 9.0-stable into master (please don't squash commits)#5977

johnnyshields wants to merge 2 commits intomongodb:mastermongodb/mongoid:masterfrom

johnnyshields:merge-9.0-stable-to-masterjohnnyshields/mongoid:merge-9.0-stable-to-masterCopy head branch name to clipboard