Update to 2.6.1
PR: ports/161306 Submitted by: "Simon Olofsson" <simon@olofsson.de> (maintainer) Feature safe: yes