Fix build for 4.2.2
Merge pull request #424 from juergenhoetzel/master

Fix build for 4.2.2