Upgrade manpageview to 25n
Merge branch 'master' into my-develop