Merge branch '1.0' of /Users/carl/git/dvdomatic into 1.0