bump to version 2.6.1
Merge branch 'hotfix/2.6.1' into develop