Fix bad merge.
Merge branch 'master' into new_transcoder