Finish 2.6.0
Set 2.6.0 release date
Merge branch 'develop'