Merge branch 'patches/020_man-hyphen-quoting' into patches/030_fix-if-else