Merge master.

diff --cc ChangeLog
index a15a44fe2b47595196af0f9a5b1db90a7bc7c49a,e550ddf3fb1f61f9aa4484bf2f325fbcb431d066..0a1f804b93789b8ac1ad807443f0ba0f33ea22d1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,14 +1,28 @@@
 +2014-07-15  Carl Hetherington  <cth@carlh.net>
 +
 +      * A variety of changes were made on the 2.0 branch
 +      but not documented in the ChangeLog.  Most sigificantly:
 +
 +      - DCP import
 +      - Creation of DCPs with proper XML subtitles
 +      - Import of .srt and .xml subtitles
 +      - Audio processing framework (with some basic processors).
 +
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add subtitle view.
 +
+ 2014-07-17  Carl Hetherington  <cth@carlh.net>
+ 
+       * Fix corrupted text in job descriptions in some cases.
+ 
+       * Speculative fix for failure to keep Windows
+       machines awake during encodes.
+ 
+ 2014-07-16  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.72.4 released.
+ 
  2014-07-16  Carl Hetherington  <cth@carlh.net>
  
        * Add default scaling setting to preferences (#384).

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