(cherry picked from commit 6e5c06d0)

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