Always assume bashrc-defaults.sh exists
Merge remote-tracking branch 'root/master'