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