Merge branch 'gdk-pixbuf'