Release 2.6.0

Signed-off-by: Ken Barber <ken@bob.sh>
Merge branch 'release_260'

* release_260:
  Release 2.6.0