Merge branch 'upstream-18.02-stable' into 18.02.x 50/12050/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Mon, 23 Apr 2018 13:49:51 +0000 (14:49 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Mon, 23 Apr 2018 13:49:55 +0000 (14:49 +0100)
Change-Id: I24611dda504db6f91820cff92593820e1d3db08f
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

Trivial merge