Merge branch 'master' into 0.11

Conflicts:
	gst/colorspace/colorspace.c

diff --cc ext/resindvd/resindvdsrc.c
index e4bdd7e,75333ea..a0059fd
--- 1/ext/resindvd/resindvdsrc.c
--- 2/ext/resindvd/resindvdsrc.c
+++ b/ext/resindvd/resindvdsrc.c
@@@ -2400,7 -2400,7 +2400,7 @@@ rsn_dvdsrc_src_event (GstBaseSrc * base
        GST_LOG_OBJECT (src, "handling seek event");
  
        gst_event_parse_seek (event, NULL, NULL, &flags, NULL, NULL, NULL, NULL);
--      src->flushing_seek = !!(flags & GST_SEEK_FLAG_FLUSH);
++      src->flushing_seek = ! !(flags & GST_SEEK_FLAG_FLUSH);
        GST_DEBUG_OBJECT (src, "%s seek event",
            src->flushing_seek ? "flushing" : "non-flushing");