(cherry picked from commit 0c876483)
Reviewed-on: https://gerrit.libreoffice.org/20576Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 4bc26e00)

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