Merge remote-tracking branch 'remotes/sbraz/bashcomp'