Merge pull request #6 from juw/changes

Changes
Merge tag 'upstream/2.6.1'

Upstream version 2.6.1
Package upstream release 2.6.1