Merge branch 'master' into 'sauron'
Fix bashrc for sauron