merge with master

diff --cc gtk2_ardour/mono_panner.cc
Simple merge

diff --cc gtk2_ardour/stereo_panner.cc
Simple merge

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

diff --cc libs/vamp-plugins/Onset.cpp
Simple merge