Development

Merging the latest work for Ardour and its dependencies.