Update to 2.6.1
PR: 215930 Reported by: koue@chaosophia.net Approved by: maintainer timeout (9 weeks)