Merge.

diff --cc windows/installer.nsi.in
index fe70153a14f2cdae991a6aa96fa6231eff6c2589,d0dd508e745fb2bc35fe2d607be5bbc41b71d495..8bea81af0d874bcee63611b220bffdc19319bfd6
--- 1/windows/installer.nsi.in
--- 2/windows/installer.nsi.in
+++ b/windows/installer.nsi.in
@@@ -27,51 -27,51 +27,52 @@@ Section "install" "Installation info
   
  SetOutPath "$INSTDIR\bin"
  
 -File "bin/asdcp-libdcp.dll"
 -File "bin/avcodec-54.dll"
 -File "bin/avfilter-3.dll"
 -File "bin/avformat-54.dll"
 -File "bin/avutil-51.dll"
 -File "bin/dcp.dll"
 -File "bin/dvdomatic-gtk.dll"
 -File "bin/dvdomatic.dll"
 -File "bin/dvdomatic.exe"
 -File "bin/intl.dll"
 -File "bin/kumu-libdcp.dll"
 -File "bin/libatkmm-1.6-1.dll"
 -File "bin/libboost_chrono-mt.dll"
 -File "bin/libboost_filesystem-mt.dll"
 -File "bin/libboost_system-mt.dll"
 -File "bin/libboost_thread_win32-mt.dll"
 -File "bin/libcairomm-1.0-1.dll"
 -File "bin/libeay32.dll"
 -File "bin/libgcc_s_sjlj-1.dll"
 -File "bin/libgdk-win32-2.0-0.dll"
 -File "bin/libgdkmm-2.4-1.dll"
 -File "bin/libgdk_pixbuf-2.0-0.dll"
 -File "bin/libgio-2.0-0.dll"
 -File "bin/libgiomm-2.4-1.dll"
 -File "bin/libglib-2.0-0.dll"
 -File "bin/libglibmm-2.4-1.dll"
 -File "bin/libgobject-2.0-0.dll"
 -File "bin/libgtk-win32-2.0-0.dll"
 -File "bin/libgtkmm-2.4-1.dll"
 -File "bin/libjpeg-7.dll"
 -File "bin/libMagick++-5.dll"
 -File "bin/libMagickCore-5.dll"
 -File "bin/libMagickWand-5.dll"
 -File "bin/libopenjpeg-1.dll"
 -File "bin/libpangomm-1.4-1.dll"
 -File "bin/libpng14-14.dll"
 -File "bin/libsigc-2.0-0.dll"
 -File "bin/libsndfile-1.dll"
 -File "bin/libssh.dll"
 -File "bin/libstdc++-6.dll"
 -File "bin/postproc-52.dll"
 -File "bin/swresample-0.dll"
 -File "bin/swscale-2.dll"
 -File "bin/zlib1.dll"
 -File "bin/libjpeg-8.dll"
 +File "%deps%/bin/asdcp-libdcp.dll"
 +File "%deps%/bin/avcodec-54.dll"
 +File "%deps%/bin/avfilter-3.dll"
 +File "%deps%/bin/avformat-54.dll"
 +File "%deps%/bin/avutil-51.dll"
 +File "%deps%/bin/dcp.dll"
 +File "%deps%/bin/intl.dll"
 +File "%deps%/bin/kumu-libdcp.dll"
 +File "%deps%/bin/libatkmm-1.6-1.dll"
 +File "%deps%/bin/libboost_chrono-mt.dll"
 +File "%deps%/bin/libboost_filesystem-mt.dll"
 +File "%deps%/bin/libboost_system-mt.dll"
 +File "%deps%/bin/libboost_thread_win32-mt.dll"
 +File "%deps%/bin/libcairomm-1.0-1.dll"
 +File "%deps%/bin/libeay32.dll"
 +File "%deps%/bin/libgcc_s_sjlj-1.dll"
 +File "%deps%/bin/libgdk-win32-2.0-0.dll"
 +File "%deps%/bin/libgdkmm-2.4-1.dll"
 +File "%deps%/bin/libgdk_pixbuf-2.0-0.dll"
 +File "%deps%/bin/libgio-2.0-0.dll"
 +File "%deps%/bin/libgiomm-2.4-1.dll"
 +File "%deps%/bin/libglib-2.0-0.dll"
 +File "%deps%/bin/libglibmm-2.4-1.dll"
 +File "%deps%/bin/libgobject-2.0-0.dll"
 +File "%deps%/bin/libgtk-win32-2.0-0.dll"
 +File "%deps%/bin/libgtkmm-2.4-1.dll"
 +File "%deps%/bin/libjpeg-7.dll"
 +File "%deps%/bin/libMagick++-5.dll"
 +File "%deps%/bin/libMagickCore-5.dll"
 +File "%deps%/bin/libMagickWand-5.dll"
 +File "%deps%/bin/libopenjpeg-1.dll"
 +File "%deps%/bin/libpangomm-1.4-1.dll"
 +File "%deps%/bin/libpng14-14.dll"
 +File "%deps%/bin/libsigc-2.0-0.dll"
 +File "%deps%/bin/libsndfile-1.dll"
 +File "%deps%/bin/libssh.dll"
 +File "%deps%/bin/libstdc++-6.dll"
 +File "%deps%/bin/postproc-52.dll"
 +File "%deps%/bin/swresample-0.dll"
 +File "%deps%/bin/swscale-2.dll"
 +File "%deps%/bin/zlib1.dll"
++File "%deps%/libjpeg-8.dll"
 +
 +File "%binaries%/src/gtk/dvdomatic-gtk.dll"
 +File "%binaries%/src/lib/dvdomatic.dll"
 +File "%binaries%/src/tools/dvdomatic.exe"
  
  CreateDirectory "$INSTDIR\etc\gtk-2.0"
  SetOutPath "$INSTDIR\etc\gtk-2.0"