(cherry picked from commit ab017c68)

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