Merge remote-tracking branch 'upstream/master' into merge-2013-11-15

Conflicts:
	ext/dash/gstdashdemux.c
	gst/mpegtsdemux/tsdemux.c
re-resolved duplicate prototype issue in ext/dash/gstmpdparser.h