Merge branch 'master' into v6.0 96/7896/1 v6.0 v6.0.2 v6.0.2rc1 v6.0.3 v6.0.4 v6.0.4rc1
authorlombardofr <lombardo@everyup.it>
Fri, 30 Aug 2019 18:15:48 +0000 (20:15 +0200)
committerlombardofr <lombardo@everyup.it>
Fri, 30 Aug 2019 18:16:00 +0000 (20:16 +0200)
Change-Id: Ided79529f4125d7de9637f62beceb9eb99749e35
Signed-off-by: lombardofr <lombardo@everyup.it>

Trivial merge