Merge branch 'gpg-libalpm-basics'