Merge branch 'master' into 0.11

diff --cc gst/playback/gstplaysinkconvertbin.c
index 95b4ad5,bade4ab..631c3a0
--- 1/gst/playback/gstplaysinkconvertbin.c
--- 2/gst/playback/gstplaysinkconvertbin.c
+++ b/gst/playback/gstplaysinkconvertbin.c
@@@ -384,9 -375,10 +384,10 @@@ gst_play_sink_convert_bin_getcaps (GstP
    if (otherpad) {
      peer = gst_pad_get_peer (otherpad);
      if (peer) {
 -      GstCaps *peer_caps = gst_pad_get_caps_reffed (peer);
 +      GstCaps *peer_caps = gst_pad_get_caps (peer, filter);
        gst_object_unref (peer);
        if (self->converter_caps) {
+         peer_caps = gst_caps_make_writable (peer_caps);
          gst_caps_merge (peer_caps, gst_caps_ref (self->converter_caps));
          ret = peer_caps;
        } else {