Merge branch 'cb/t3404-shellquote'