tree f1f2e401c6c99b957d5c7aa06e3dd0a12ee1c771
parent 048de56ecddc28513e023fa422dc1ed7e2d3ec6f
parent 70c3331278f71d3b22fc3a090d526b4b8106d155
author lombardofr <lombardo@everyup.it> 1590147217 +0200
committer lombardofr <lombardo@everyup.it> 1590147234 +0200

Merge branch 'master' into v7.0

Change-Id: Ib897981a21e8cf5c5a5b814334520d3b0dc80693
Signed-off-by: lombardofr <lombardo@everyup.it>