bash.bashrc: Merge upstream changes