Merge tag 'upstream/18.11-rc4' into 18.11.x 25/16025/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Mon, 19 Nov 2018 13:00:03 +0000 (13:00 +0000)
committerLuca Boccassi <luca.boccassi@gmail.com>
Mon, 19 Nov 2018 13:22:26 +0000 (13:22 +0000)
Upstream version 18.11-rc4

Change-Id: I0ae00b31e3b74bb949a8c14753cada70a1325a64
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

Trivial merge