Merge remote-tracking branch 'origin/3.6-release' into jackkoenig/3.6.x/modernize-release-flow

But ignore changes for 3.6-release. This is just to get the 3.6.0 tag in
the commit history.

Author: jackkoenig