Merge branch 'master' into gdk-pixbuf