(cherry picked from commit 66686e44)
Reviewed-on: https://gerrit.libreoffice.org/20554Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 282b1aa3)

Change-Id: Iabedfcce9d8ef21172e6bd0d654f3a258aae97e3
Reviewed-on: https://gerrit.libreoffice.org/20555Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit fdc0c739)