(cherry picked from commit 16c6c9fb)

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