Merge commit 'v0.9.12.1' into v0.9.12-maint

Done by 'git merge -s ours v0.9.12.1', so that the maint branch
will contain all release tags.
Signed-off-by: NEric Blake <eblake@redhat.com>