Merge branch 'upstream' into 17.11.x 54/9454/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Thu, 16 Nov 2017 13:26:40 +0000 (13:26 +0000)
committerLuca Boccassi <luca.boccassi@gmail.com>
Thu, 16 Nov 2017 13:27:33 +0000 (13:27 +0000)
Change-Id: I7c5a806f100bfa4324e17c91490e952762a30ee4
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

Trivial merge