Merge.

diff --cc ChangeLog
index f7e10cc3e7e6fe6547f59e9e16ec3277dcc59015,5e38fc74232130fa8f62681998cd33621caf3560..19cd66c71cb40c4cd8b142352f62a9179c45746d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2017-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +      * Handle failure to write to cinemas file more nicely.
 +
+ 2017-03-03  Carl Hetherington  <cth@carlh.net>
+ 
+       * Add option to write KDMs to separate folders
+       or ZIP files.
+ 
  2017-02-28  Carl Hetherington  <cth@carlh.net>
  
        * Updated de_DE translation from Carsten Kurz.

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

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

diff --cc src/tools/dcpomatic.cc
Simple merge