(cherry picked from commit d8bf31e1) Conflicts: libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx Change-Id: Ib31fca3d8b4119704fb1a5c3cee885e7c239c247