One fix was accepted, one was added. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 22369ad788)
22369ad788