Merge branch 'upstream' into HEAD 82/8182/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Wed, 23 Aug 2017 13:47:51 +0000 (14:47 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Wed, 23 Aug 2017 13:48:05 +0000 (14:48 +0100)
Change-Id: Ib9772cbbc33c14a44bd918056b22602ff6891a18
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

Trivial merge