This series incorporates one patch from Vicente, and provides an alternative fix to the recent rpm autobuild failure. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire at gmail.com> ---