Upstream again

Upstream merged again.

Signed-off-by: Bart Kerkvliet <bkerkvliet@gmail.com>