Merge branch 'master' of vampire:~mdw/etc/profile