Merge branch 'master' into cairocanvas

diff --cc gtk2_ardour/ardour3_ui_default.conf
Simple merge

diff --cc gtk2_ardour/editor_mixer.cc
Simple merge

diff --cc libs/ardour/wscript
index d2281e42610ca3fa18343df3cd8dce6103e1a519,dbc0335ecdf491dfc10fea5c7dcca47a976a0a37..18c2188f6a6cd24c4c24208fb0523b873d50e8ba
--- 1/libs/ardour/wscript
--- 2/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@@ -241,11 -241,10 +241,11 @@@ def configure(conf)
      autowaf.build_version_files(
          path_prefix + 'ardour/version.h',
          path_prefix + 'version.cc',
 -        'libardour3', conf.env['MAJOR'], conf.env['MINOR'], 0)
 +        'libardour3', conf.env['MAJOR'], conf.env['MINOR'], 0,
 +        'LIBARDOUR_API', 'ardour/libardour_visibility.h')
      autowaf.configure(conf)
      autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO',
-                       atleast_version='0.3.2')
+                       exact_version='0.3.2')
      autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
      autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF',
                        atleast_version='0.4.0')

diff --cc libs/backends/jack/jack_audiobackend.cc
Simple merge

diff --cc libs/gtkmm2ext/gtkmm2ext/dndvbox.h
Simple merge

diff --cc wscript
Simple merge