Merge branch 'zecke/mgcp-transcoder'