Release 2.6.1

Merge from branch '2.6.1'
Merge remote-tracking branch 'origin/master' into develop