Merge in additional fix for manpages.