Preparing for 4.2.0.rc2 release
Merge tag 'tags/v4.2.0.rc2' into 4-2-stable

v4.2.0.rc2 release

I forgot to push this commit after doing the release, so the two branches
diverged.