(cherry picked from commit 3d3594a2)

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