Merge branch 'master' into v7.0 58/8958/1 v7.0 v7.1.0 v7.1.0rc2 v7.1.0rc3 v7.1.0rc4 v7.1.0rc5 v7.1.0rc6 v7.1.2 v7.1.3 v7.1.4 v7.1.5
authorlombardofr <lombardo@everyup.it>
Fri, 22 May 2020 11:33:37 +0000 (13:33 +0200)
committerlombardofr <lombardo@everyup.it>
Fri, 22 May 2020 11:33:54 +0000 (13:33 +0200)
Change-Id: Ib897981a21e8cf5c5a5b814334520d3b0dc80693
Signed-off-by: lombardofr <lombardo@everyup.it>

Trivial merge