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