Merge branch 'video-player' of /home/carl/git/dvdomatic into video-player