From b42d775f1350838234f9f05bf64a4f7c12282218 Mon Sep 17 00:00:00 2001
From: Mehdi Goli <mehdi.goli@codeplay.com>
Date: Tue, 23 May 2017 10:51:14 +0100
Subject: [PATCH] Temporarry branch for synch with upstream