Merge tag 'debian/5.0_a5-1' into debian