Merge branch 'master' into v5.0 43/7143/1 v5.0 v5.0.3 v5.0.4 v5.0.5
authorFrancesco Lombardo <franclombardo@gmail.com>
Wed, 30 Jan 2019 10:30:46 +0000 (11:30 +0100)
committerlombardofr <lombardo@everyup.it>
Wed, 30 Jan 2019 10:35:45 +0000 (11:35 +0100)
Change-Id: Ifaefd3b1f87bf4305838725b1f82518c2cfecb15
Signed-off-by: lombardofr <lombardo@everyup.it>

Trivial merge