Modifications for work environment
Merge branch 'master' into work-env
Merge branch 'master' into work-env
Merge branch 'master' into work-env
Set some bash options only in interactive shell