Merge branch 'sg/t6500-no-redirect-of-stdin'