From 56a6b7d2228edbeaa3fe8260acf238521bb02577 Mon Sep 17 00:00:00 2001
From: viegasdom <b.viegasdom@gmail.com>
Date: Thu, 11 Apr 2019 15:47:20 +0100
Subject: [PATCH] sync: squashed up to merge
 69bd30507559be3dea905686b46bc3295c951f45 in
 37281a400d29ec4f515fb8a590d4f012689d89d7