Merge branch 'master' into windows

diff --cc gtk2_ardour/export_video_dialog.cc
Simple merge

diff --cc gtk2_ardour/mixer_strip.cc
Simple merge

diff --cc gtk2_ardour/processor_box.cc
Simple merge

diff --cc gtk2_ardour/transcode_video_dialog.cc
Simple merge

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

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

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

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

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

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

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

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

diff --cc libs/audiographer/audiographer/debug_utils.h
Simple merge

diff --cc wscript
Simple merge