Merge branch 'upstream' into 18.08.x 26/14226/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Tue, 14 Aug 2018 17:55:37 +0000 (18:55 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 14 Aug 2018 17:57:39 +0000 (18:57 +0100)
Change-Id: Ifbda2d554199dd4d11e01f0090881b5f0103ae12
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

Trivial merge