Merge remote-tracking branch 'mauro-exp/docbook3' into death-to-docbook