Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --cc wscript
index 867b0385ecd12160c5545b461065ca5d25467b9a,6c72d747e1126c252f829a5a791d42c9e37af131..98c31d08e8592240b7b6e743c3b6a1ecef78860d
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -23,10 -23,10 +23,10 @@@ import sy
  import glob
  import distutils
  import distutils.spawn
 -from waflib import Logs
 +from waflib import Logs, Context
  
  APPNAME = 'dcpomatic'
- VERSION = '2.4.6devel'
+ VERSION = '2.4.7devel'
  
  def options(opt):
      opt.load('compiler_cxx')