man and src version
Merge branch 'master' into debian