[xtables-addons-kmod/f29: 3/3] Merge branch 'master' into f29