Reviewed-on: https://gerrit.libreoffice.org/32948Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit e8b49f09)

Change-Id: Idcbc8655108ff57c06c33bbcabd652387bf3c4ec
(cherry picked from commit fb68934e)