f74b50e
Rebase to upstream, fix a pile of bugs. The usual. Signed-off-by: Peter Jones <pjones@redhat.com>