Merge.

diff --cc ChangeLog
index 8e182f80cc28b16dbc178243720d23a471b20266,8509a066e10b240021eee7e9a83996ddd47200d3..3c384d14ca543278c0478185aec0b7598da5dce1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,11 +1,15 @@@
 +2015-06-25  c.hetherington  <cth@carlh.net>
 +
 +      * Add decode debugging option.
 +
+ 2015-06-25  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 2.1.9 released.
+ 
+ 2015-06-24  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 2.1.8 released.
+ 
  2015-06-24  c.hetherington  <cth@carlh.net>
  
        * Bump libdcp for probable fix to various font ID problems (#620).