Merge branch 'master' into 0.11

Conflicts:
	libs/gst/base/gstbasesrc.c

diff --cc gst/gsttask.c
Simple merge

diff --cc libs/gst/base/gstbasesrc.c
index ccd7bf2,e2efcaa..c40ae94
--- 1/libs/gst/base/gstbasesrc.c
--- 2/libs/gst/base/gstbasesrc.c
+++ b/libs/gst/base/gstbasesrc.c
@@@ -2139,11 -2111,10 +2139,10 @@@ gst_base_src_update_length (GstBaseSrc 
      }
    }
  
--  /* keep track of current position and update duration.
++  /* keep track of current duration.
     * segment is in bytes, we checked that above. */
    GST_OBJECT_LOCK (src);
 -  gst_segment_set_duration (&src->segment, GST_FORMAT_BYTES, size);
 +  src->segment.duration = size;
-   src->segment.position = offset;
    GST_OBJECT_UNLOCK (src);
  
    return TRUE;