Merge branch 'bug_537_vobsub' into experimental