Merge branch 'master' into windows

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/editor_videotimeline.cc
Simple merge

diff --cc gtk2_ardour/export_video_dialog.cc
Simple merge

diff --cc gtk2_ardour/plugin_ui.cc
Simple merge

diff --cc gtk2_ardour/processor_box.cc
Simple merge

diff --cc gtk2_ardour/wscript
Simple merge

diff --cc libs/ardour/audioengine.cc
Simple merge

diff --cc libs/ardour/route.cc
Simple merge

diff --cc libs/ardour/test/test_common.cc
Simple merge

diff --cc libs/ardour/test/test_common.h
index 10bfdbc694d6e50f1ec80ded2d422db616098927,91fd066ac2e72e82f9ce13ec5f626c305c3990d8..bfda5435086d59d3fac1519784a1713815da21b3
--- 1/libs/ardour/test/test_common.h
--- 2/libs/ardour/test/test_common.h
+++ b/libs/ardour/test/test_common.h
@@@ -21,8 -21,10 +21,10 @@@
  
  #include "pbd/search_path.h"
  
 -PBD::SearchPath test_search_path ();
 +PBD::Searchpath test_search_path ();
  
- std::string new_test_output_dir ();
+ std::string new_test_output_dir (std::string prefix = "");
+ 
+ int get_test_sample_rate ();
  
  #endif

diff --cc libs/ardour/wscript
Simple merge

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

diff --cc libs/surfaces/mackie/mackie_control_protocol.cc
Simple merge