Merge tag 'upstream/2.6.1'

Upstream version 2.6.1
Package upstream release 2.6.1
Merge pull request #9 from juw/changes

Update packaging to 2.6.1