(cherry picked from commit ecb016e1)

Change-Id: I963c554234d335dff758e94822259cf44254de9b
Reviewed-on: https://gerrit.libreoffice.org/66435
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>