Merge branch 'km/bsd-shells'