Code

Merge branch 'master' (early part) into pd/bash-4-completion