Merge.

diff --cc ChangeLog
index 2ea2697cd412172d67d77908d8184a7d2588b4e4,76f4adaa04f3952896291c31743526515c726d1c..34fe178a42763cb8a66206e09b1d0bb947ebb8c3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
 +2016-10-07  Carl Hetherington  <cth@carlh.net>
 +
 +      * Fix XML subtitle output in some cases.
 +
+ 2016-10-06  c.hetherington  <cth@carlh.net>
+ 
+       * Allow selection of CPL in multi-CPL DCPs (#733).
+ 
  2016-10-05  Carl Hetherington  <cth@carlh.net>
  
        * Updated fr_FR translation from Thierry Journet.