Mark branch 'upstream-rochade' as merged into upstream-stable