fix build errors
Merge pull request #69 from UGerhards/v5-stable-fix3

fix build errors
Merge branch 'v5-stable' into v7-stable
Merge branch 'v7-stable' into v8-stable