Merge branch 'jc/fix-tap-output-under-bash'