Merge branch 'bash'