oops still redefined shell
Merge branch 'master' into zdoom