Merge branch 'master' of git.ardour.org:ardour/ardour
authorNikolaus Gullotta <nik@harrisonconsoles.com>
Wed, 28 Aug 2019 19:19:43 +0000 (14:19 -0500)
committerNikolaus Gullotta <nik@harrisonconsoles.com>
Wed, 28 Aug 2019 19:19:43 +0000 (14:19 -0500)

Trivial merge