(cherry picked from commit 58a04e69)

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