Merge branch 'master' into 0.11

Conflicts:
	ext/pulse/pulseaudiosink.c
	ext/pulse/pulsesink.c

diff --cc ext/pulse/pulseaudiosink.c
index 941b9b6,bfd5483..0ac49a8
--- 1/ext/pulse/pulseaudiosink.c
--- 2/ext/pulse/pulseaudiosink.c
+++ b/ext/pulse/pulseaudiosink.c
@@@ -642,7 -653,14 +642,14 @@@ proxypad_blocked_cb (GstPad * pad, GstP
  
    if (!pbin->format_lost) {
      sinkpad = gst_element_get_static_pad (GST_ELEMENT (pbin->psink), "sink");
-     caps = gst_pad_get_caps (pad, NULL);
+ 
 -    if (GST_PAD_CAPS (pbin->sinkpad)) {
++    if (gst_pad_has_current_caps (pbin->sinkpad)) {
+       /* See if we already got caps on our sinkpad */
 -      caps = gst_caps_ref (GST_PAD_CAPS (pbin->sinkpad));
++      caps = gst_pad_get_current_caps (pbin->sinkpad);
+     } else {
+       /* We haven't, so get caps from upstream */
 -      caps = gst_pad_get_caps_reffed (pad);
++      caps = gst_pad_get_caps (pad, NULL);
+     }
  
      if (gst_pad_accept_caps (sinkpad, caps)) {
        if (pbin->dbin2) {

diff --cc ext/pulse/pulsesink.c
Simple merge

diff --cc gst/equalizer/gstiirequalizer.c
Simple merge