Merge branch 'rochade' into master (modulo lintian update)