Padraic Brady 19e24c5804 Merge branch 'master' into tls-config %!s(int64=11) %!d(string=hai) anos
..
cacert.pem 470fb58273 Add a bundled cacert.pem as a last resort option %!s(int64=11) %!d(string=hai) anos
composer-schema.json ad1f8e6c5a Add classmap-authoritative config setting %!s(int64=11) %!d(string=hai) anos
spdx-identifier.json 494f5698c4 Update SPDX licenses, fixes #3431 %!s(int64=11) %!d(string=hai) anos