fix broken merge; sync with upstream

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