Merge branch 'master' into 0.11

Conflicts:
	common
	ext/pango/gsttextoverlay.c
	gst-libs/gst/video/video.c

diff --cc common
index 762b692,63d592e..a62f3d4
--- 1/common
--- 2/common
+++ b/common
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 762b6927ffdd1726cb4f4783f49b5cfaa9edd941
 -Subproject commit 63d592ed74618734d69438c770d6462efeb5ab9d
++Subproject commit a62f3d4acded1a2913cfe6125a5831274d55c52b

diff --cc configure.ac
Simple merge

diff --cc gst-libs/gst/audio/gstaudioiec61937.c
Simple merge

diff --cc gst-libs/gst/audio/gstbaseaudiosink.c
Simple merge

diff --cc gst-libs/gst/audio/gstbaseaudiosink.h
Simple merge

diff --cc tests/examples/seek/seek.c
Simple merge

diff --cc win32/common/libgstaudio.def
index 79cf6d9,cc8e310..b660865
--- 1/win32/common/libgstaudio.def
--- 2/win32/common/libgstaudio.def
+++ b/win32/common/libgstaudio.def
@@@ -75,7 -75,10 +75,9 @@@ EXPORT
        gst_audio_set_structure_channel_positions_list
        gst_audio_sink_get_type
        gst_audio_src_get_type
 -      gst_audio_structure_set_int
        gst_base_audio_sink_create_ringbuffer
+       gst_base_audio_sink_get_alignment_threshold
+       gst_base_audio_sink_get_discont_wait
        gst_base_audio_sink_get_drift_tolerance
        gst_base_audio_sink_get_provide_clock
        gst_base_audio_sink_get_slave_method