Release 2.5.0

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

* release_250:
  Release 2.5.0