Signed-off-by: Marcos Del Sol Vives <marcos@orca.pet> [ fix for 19.07 branch ] Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>