Merge branch 'windows' of git.ardour.org:ardour/ardour into windows