Add things to port.
Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
More stuff to port.
Merge.