Conflicts:
	src/include/switch_core_media.h
	src/mod/endpoints/mod_sofia/sofia_media.c
	src/switch_core_media.c