Merge branch 'upstream' into 17.11.x 99/9399/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Mon, 13 Nov 2017 10:38:53 +0000 (10:38 +0000)
committerLuca Boccassi <luca.boccassi@gmail.com>
Mon, 13 Nov 2017 10:38:59 +0000 (10:38 +0000)
commitc1795dec1e864d948eb5d6babac7b4417cb8b3be
treeb200074d32cb7551f54a93ba5b5b2c10b0c77b96
parentacf94b73356456e99aee3509f5c2e2a84aa2e10a
parent976be7358289d46cd5ed8131bbf2e2c5a6838d3c
Merge branch 'upstream' into 17.11.x

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