Bump version for repackaging
Merge branch 'release/2.6.1'
Merge remote-tracking branch 'upstream/master' into seedsman
don't allow international tracked to switzerland