Merge remote-tracking branch 'upstream/master' into ruih/merge-2014-04-21

Conflicts:
	configure.ac
	ext/flac/gstflacenc.c
	ext/soup/gstsouphttpsrc.c
	gst/avi/gstavidemux.c
	gst/matroska/matroska-demux.c
	gst/matroska/matroska-parse.c
	gst/rtpmanager/gstrtpbin.c
	gst/rtpmanager/gstrtpjitterbuffer.c
	gst/rtpmanager/gstrtprtxsend.c
	gst/rtpmanager/gstrtpsession.c
	gst/rtpmanager/rtpsession.c
	gst/rtpmanager/rtpsession.h
	gst/rtsp/gstrtspsrc.c
	sys/osxvideo/osxvideosink.m
	sys/v4l2/gstv4l2bufferpool.c
	sys/v4l2/gstv4l2object.c
	sys/v4l2/gstv4l2object.h
	sys/v4l2/gstv4l2src.c
	sys/v4l2/v4l2_calls.c
	tests/check/Makefile.am
	tests/check/elements/rtprtx.c