OS X build fix.
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0