Merge master.

diff --combined 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).
@@@ -39,7 -36,6 +50,7 @@@
  2014-07-10  Carl Hetherington  <cth@carlh.net>
  
        * Version 1.72.2 released.
 +>>>>>>> origin/master
  
  2014-07-10  Carl Hetherington  <cth@carlh.net>
  

diff --combined src/lib/cross.cc
index 0224e461d5fb8193fe82841ecdb34051711b2f6a,9b7d5594f392ecde245ff6646ccce4766133a1f2..d84c17c55b25318ef5b32a0a06eda8ee23ac1d16
--- 1/src/lib/cross.cc
--- 2/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@@ -1,5 -1,5 +1,5 @@@
  /*
 -    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 +    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
  
      This program is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
@@@ -310,7 -310,7 +310,7 @@@ voi
  Waker::nudge ()
  {
  #ifdef DCPOMATIC_WINDOWS
-       SetThreadExecutionState (ES_CONTINUOUS);
+       SetThreadExecutionState (ES_SYSTEM_REQUIRED);
  #endif        
  }