[gtk] (15 commits) Non-fast-forward update to branch async-highlight

[Matthias Clasen <matthiasc src gnome org>]

The branch 'async-highlight' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  cf847ac... widget-factory: Add an error label
  e06a8e3... gtk-demo: Group small images
  fa53525... Speed up gtk_text_buffer_insert_markup
  ad09e0b... wip: towards async fontify
  e323ca3... Fix a lockup problem

Commits added to the branch:

  7226878... gtk-demo: Group small images (*)
  0d0807f... Merge branch 'matthiasc/for-master' into 'master' (*)
  88dcd25... Speed up gtk_text_buffer_insert_markup (*)
  ebaf533... Merge branch 'matthiasc/for-master' into 'master' (*)
  ef22c4a... Updated Spanish translation (*)
  ff51d7b... Updated Spanish translation (*)
  3a0fdff... Updated Spanish translation (*)
  e9afb63... widget-factory: Add more error states (*)
  dded2dd... Merge branch 'matthiasc/for-master' into 'master' (*)
  b4508be... OpenBSD: don't include malloc.h (*)
  0228c89... Merge branch 'openbsd-roaring' into 'master' (*)
  4c78f62... gtk-demo: Fontify asynchronously
  ea88795... textbuffer: Some more insert_with_attributes speedup
  aacb06d... gtk-demo: Insert markup incrementally
  2ac7f2d... gtk-demo: Move the highlighting to a separate file

(*) This commit already existed in another branch; no separate mail sent