Merge branch 'jc/cocci-xstrdup-or-null' into maint