Merge branch 'upstream-16.11-stable' into 16.11.x 60/13660/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Tue, 24 Jul 2018 15:54:23 +0000 (16:54 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 24 Jul 2018 15:54:26 +0000 (16:54 +0100)
Change-Id: I63e43d3cdc0ac549e2ff917005ccaeec9787b89e
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

Trivial merge