Trying to get folding for man pages.
Merge remote-tracking branch 'origin/master'