Merge tag 'sisu_6.5.0' into debian/sid