Merge branch 'master' into v6.0

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