Merge branch 'mingw-updates' of https://github.com/mojofunk/ardour into cairocanvas