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