Make tests robust to config changes of J2K bandwidth.
Slight rearrangemen to log options in config dialog.
Merge remote-tracking branch 'origin/master' into 2.0
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Bump for cxml version bump as dep of libdcp.
Try to fix over-shrinky config dialog on OS X.
Fix OS X build.
Fix warning.
Fix hidden advanced preferences button in some locales (e.g. de_DE).
Merge master.