Post 2.6.0: Fix changelog and docs issues
#132
Merged
2.6.0: Fix changelog and docs issues
#132