Merge branch 'mathematica' into installed-next
Merge branch 'vobsub2srt' into installed-next
zsh: don't clobber the environment of non-login shells
Merge branch 'zsh' into installed-next