Merge branch 'binfmt-and-shell-detection'