Fixed MANPATH conflict
Merge branch 'master' into vee-1.0