Merge branch 'upstream-experimental' into upstream

Conflicts:
	docs/plugins/html/gst-plugins-good-plugins-gdkpixbufoverlay.html