Mark branch 'rochade' as merged into 'master'