From 3069fb915b2e13c503875f146538cef59113af03 Mon Sep 17 00:00:00 2001
From: "Gerasimos (Makis) Maropoulos" <kataras2006@hotmail.com>
Date: Sun, 31 Dec 2017 03:45:29 +0200
Subject: [PATCH] resolve conflicts from master

Former-commit-id: 893b3b1903cdde396356193d860987faac79f826