cosmetic: remove compiler warning
Merge branch 'master' into master-wildcards