Merge branch 'fc/docbook-remove-groff-workaround'