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

Former-commit-id: e196ccc4a4e390b4d2b623a322d12e90dc9141d2