Merge branch 'EXP-TVE3.5-MP1-MP2-SoftwareEncoders' into EXP-TVE3.5-MP1-MP2-20140118