Merge branch 'html' into debian/buster_html

diff --cc .gitignore
index 1d5525a3395fd3e14738e379800aee5c8089ef32,b859a1ce664970e7ed180bb0772c1ac49673b954..b99641c32754a40455626dce19b32af8fe7a6da3
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -61,7 -61,7 +61,8 @@@ Rules-quo
  tests/grid
  tests/grid_from_xml
  tests/grid_tree
+ tests/grid_html_from_xml
  test-driver
  *.gir
 -*.typelib
 +*.typelib
 +build