mantis 0005805
Merge branch 'master' of https://github.com/derAbgang/ardour