Merge branch 'jn/test-terminal-punt-on-osx-breakage' into next