Original patches by Zbigniew Jędrzejewski-Szmek. Merges: #16 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
Signed-off-by: Robbie Harwood <rharwood@redhat.com>