Merge branch 'upstream-16.11-stable' into 16.11.x 54/12054/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Mon, 23 Apr 2018 13:20:17 +0000 (14:20 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 24 Apr 2018 07:23:10 +0000 (08:23 +0100)
Change-Id: Ie0b10377bb151ddac6307982be5b15624206e6a6
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

Trivial merge