Change-Id: Ie24c416cb9ba8de904bf6e725a60b62ce7787596
Reviewed-on: https://gerrit.libreoffice.org/65742
(cherry picked from commit 18b9f23f)
Reviewed-on: https://gerrit.libreoffice.org/65884
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>