8c6b1ac
Reconcile with upstream once again. Also include some minor fixes for gcc 5.1.1 Signed-off-by: Peter Jones <pjones@redhat.com>