Merge branch 'upstream-17.11-stable' into 17.11.x 23/14623/1
authorLuca Boccassi <[email protected]>
Mon, 3 Sep 2018 09:48:52 +0000 (10:48 +0100)
committerLuca Boccassi <[email protected]>
Mon, 3 Sep 2018 09:49:31 +0000 (10:49 +0100)
Change-Id: Id5d87fa34325cf80217a1f633c9dc1808e931af8
Signed-off-by: Luca Boccassi <[email protected]>

Trivial merge