Merge branch 'upstream' into 17.11.x 07/9307/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Wed, 8 Nov 2017 14:50:17 +0000 (14:50 +0000)
committerLuca Boccassi <luca.boccassi@gmail.com>
Wed, 8 Nov 2017 14:50:22 +0000 (14:50 +0000)
Change-Id: I9f728c5947bfb5ba81f00306b7997685463ca13e
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

Trivial merge