(cherry picked from commit 3a4bcd94)

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