Merge branch 'jk/maint-do-not-feed-stdin-to-tests'