TH fix for allowing to build with 7.8
Bump version
Merge remote-tracking branch 'upstream/master'