Bump to release version
Merge branch '1.8-maint'