Merge branch 'release/2.8.praekelt'
Merge branch 'release/2.9'
Merge branch 'release/2.9.praekelt'
Use correct version in strange location