Merge branch 'nsm' of https://github.com/royvegard/ardour