Fix cosmetic issue with deprecation warnings
[ci skip]
Merge branch 'master' into geezer