Merge branch 'extra-dist-tests-ksh-bug'