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