Merge branch 'master--optional-external-libs' of https://github.com/nphilipp/ardour