Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0

diff --cc src/lib/config.cc
Simple merge

diff --cc src/lib/config.h
Simple merge

diff --cc src/lib/kdm.cc
Simple merge

diff --cc src/wx/config_dialog.cc
Simple merge