Merge branch 'content-rework-take5' of /home/carl/git/dvdomatic into content-rework...