Release 2.6.0
Merge branch 'master' into develop