Added support for .bashrc_local
Merge commit