Merge branch 'master' into cairocanvas

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/ardour_ui_options.cc
Simple merge

diff --cc gtk2_ardour/route_time_axis.cc
Simple merge

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

diff --cc libs/ardour/wscript
Simple merge