Fix regression from 0785c95589bf6197166f289b416e3e8e14e2e7e0
Merge branch 'master' into coverity_scan