point release preparations
Merge remote-tracking branch 'upstream/release-2_2' into release-2_2