Merge tag 'sisu_7.1.11' into debian/sid