merge (w/fix) with master

diff --cc gtk2_ardour/plugin_ui.cc
Simple merge

diff --cc libs/ardour/ardour/audio_buffer.h
Simple merge

diff --cc libs/ardour/ardour/buffer.h
Simple merge

diff --cc libs/ardour/ardour/midi_buffer.h
Simple merge

diff --cc libs/ardour/export_channel.cc
index 296bfc9022493ada07e2d2a03e41de1fc9c8e59c,0e029a01f7731e06759c5535717bf5541bb28a10..fc71d8536f049cfe413642bb1efd8b9d4b810506
--- 1/libs/ardour/export_channel.cc
--- 2/libs/ardour/export_channel.cc
+++ b/libs/ardour/export_channel.cc
@@@ -239,11 -239,7 +239,11 @@@ RouteExportChannel::read (Sample const 
  {
        assert(processor);
        AudioBuffer const & buffer = processor->get_capture_buffers().get_audio (channel);
-       assert (frames <= (framecnt_t) buffer.size());
 +#ifndef NDEBUG
 +      (void) frames;
 +#else
+       assert (frames <= (framecnt_t) buffer.capacity());
 +#endif
        data = buffer.data();
  }
  

diff --cc libs/ardour/lv2_evbuf.c
Simple merge

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

diff --cc libs/panners/vbap/vbap.cc
Simple merge