Bump version to 2.6.1
Merge remote-tracking branch 'origin' into release/2.6.1
Merge branch 'release/2.6.1'
Merge tag '2.6.1' into develop

2.6.1