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)
Change-Id: I68ef2636536dc97016038c50669a96e95424db0e
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

Trivial merge