Merge branch 'master' into 0.11

Conflicts:
	gst/playback/gstsubtitleoverlay.c
	tests/check/elements/decodebin2.c

diff --cc gst/playback/gstdecodebin2.c
Simple merge

diff --cc gst/playback/gstplaybin2.c
Simple merge

diff --cc gst/playback/gstsubtitleoverlay.c
index 103388d,66b6565..78ff733
--- 1/gst/playback/gstsubtitleoverlay.c
--- 2/gst/playback/gstsubtitleoverlay.c
+++ b/gst/playback/gstsubtitleoverlay.c
@@@ -1762,8 -1801,8 +1762,8 @@@ gst_subtitle_overlay_subtitle_sink_getc
  static gboolean
  gst_subtitle_overlay_subtitle_sink_acceptcaps (GstPad * pad, GstCaps * caps)
  {
 -  GstCaps *othercaps = gst_subtitle_overlay_subtitle_sink_getcaps (pad);
 +  GstCaps *othercaps = gst_subtitle_overlay_subtitle_sink_getcaps (pad, NULL);
-   gboolean ret = gst_caps_can_intersect (caps, othercaps);
+   gboolean ret = gst_caps_is_subset (caps, othercaps);
  
    gst_caps_unref (othercaps);