Merge branch 'external-audio' of /home/carl/git/dvdomatic into external-audio