sync to upstream

Signed-off-by: Gregor Best <gbe@ring0.de>