v2.6.0
Merge branch 'dev'