sync with upstream (now for real, this should have been part of commit 2811e1ceb3fca4c35908c1e9f29305f523f2efb2 )

Signed-off-by: Marian 'VooDooMan' Meravy <vdm113@gmail.com>