Another release is overdue for quite some time, so I'm backporting three fixes from upstream which I plan to backport into 19.07 as well. Ref: FS#2880 Signed-off-by: Petr Štetiar <ynezz@true.cz> (cherry picked from commit 76a0ddf1308782a4da2693978955aee9cf631862)