Merge branch 'master' into 0.11

Conflicts:
	ext/pulse/pulseaudiosink.c

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

diff --cc ext/pulse/pulsesink.c
index ee917b3,14c70e3..7500196
--- 1/ext/pulse/pulsesink.c
--- 2/ext/pulse/pulsesink.c
+++ b/ext/pulse/pulsesink.c
@@@ -1820,8 -1865,9 +1820,9 @@@ gst_pulsesink_class_init (GstPulseSinkC
    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
    GstBaseSinkClass *gstbasesink_class = GST_BASE_SINK_CLASS (klass);
    GstBaseSinkClass *bc;
 -  GstBaseAudioSinkClass *gstaudiosink_class = GST_BASE_AUDIO_SINK_CLASS (klass);
 +  GstAudioBaseSinkClass *gstaudiosink_class = GST_AUDIO_BASE_SINK_CLASS (klass);
    GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
+   gchar *clientname;
  
    gobject_class->finalize = gst_pulsesink_finalize;
    gobject_class->set_property = gst_pulsesink_set_property;