Change-Id: Iaaefbe2311e61be3b9689c693481d149aa1355f5
(cherry picked from commit 0261be7f)
(cherry picked from commit 2365ff9f)
Reviewed-on: https://gerrit.libreoffice.org/20372Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>