Fixed bashrc.d bug.
Merge branch 'master' into mac