Merge master.

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

diff --cc src/lib/wscript
index 896598a0efd64302f018fe2a33643f29028403e8,8e9d3470665281269b3ad4c5ebdcdb2c323f9eb8..8f0e851e39d6a6387f2cad7bc6945bd47f5bdf27
--- 1/src/lib/wscript
--- 2/src/lib/wscript
+++ b/src/lib/wscript
@@@ -51,11 -45,8 +51,10 @@@ sources = ""
            timer.cc
            transcode_job.cc
            transcoder.cc
 +          types.cc
            ui_signaller.cc
            util.cc
-           version.cc
 +          video_content.cc
            video_decoder.cc
            video_source.cc
            writer.cc

diff --cc wscript
Simple merge