Merge branch 'master' into 0.11

Conflicts:
	ext/pango/gsttextoverlay.c
	gst/encoding/gstencodebin.c

diff --cc gst/encoding/gstencodebin.c
index f081a1cc8140bdffa1d76f342415684260ce6413,3ce67ff44cf78dfdf9003443545cf210e38c5d92..6f691918d656a1e2d29ce2d355cdcf25d5397291
--- 1/gst/encoding/gstencodebin.c
--- 2/gst/encoding/gstencodebin.c
+++ b/gst/encoding/gstencodebin.c
@@@ -1062,8 -1066,9 +1062,8 @@@ _create_stream_group (GstEncodeBin * eb
     * If we have no muxer or
     * if the muxer isn't a formatter and doesn't implement the tagsetter interface
     */
 -  if (!ebin->muxer
 -      || (!gst_element_implements_interface (ebin->muxer, GST_TYPE_TAG_SETTER)
 +  if (!ebin->muxer || (!GST_IS_TAG_SETTER (ebin->muxer)
-           || !_has_class (ebin->muxer, "Formatter"))) {
+           && !_has_class (ebin->muxer, "Formatter"))) {
      sgroup->formatter = _get_formatter (ebin, sprof);
      if (sgroup->formatter) {
        GST_DEBUG ("Adding formatter for %" GST_PTR_FORMAT, format);