Merge branch 'staging' of /home/carl/git/dvdomatic into staging