Merge branch 'upstream-16.11-stable' into 16.11.x 49/8249/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Wed, 30 Aug 2017 14:10:05 +0000 (15:10 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Wed, 30 Aug 2017 14:10:26 +0000 (15:10 +0100)
Change-Id: I3b497e8d6502e28c768832c21bce66c5c097c7be
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

Trivial merge