(cherry picked from commit 4ae705d0)

Change-Id: I93077f954a49b3922930e4fc86c80228be0f4dd2
Reviewed-on: https://gerrit.libreoffice.org/33069Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Reviewed-on: https://gerrit.libreoffice.org/33176Reviewed-by: Michael Meeks <michael.meeks@collabora.com>