Prep for release
Merge branch 'release/2.8.praekelt' into develop