Fix build warnings
Merge branch 'master' into merge-2.061-2