(cherry picked from commit 36fa8d44) Conflicts: libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx Change-Id: I84c4102937deee662814c41607ee8de380a067f2