Merge branch 'master' into windows

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/video_server_dialog.cc
Simple merge

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

diff --cc wscript
Simple merge