Merge branch 'pt5-fix' of https://github.com/zamaudio/ardour