Some include tidying.
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0