Merge 17.05.1 into 17.05.x 93/7393/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Mon, 3 Jul 2017 14:13:28 +0000 (15:13 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Mon, 3 Jul 2017 14:14:25 +0000 (15:14 +0100)
Change-Id: I65fdca844ad178ec6e2c086d45b901df93b55e58
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

Trivial merge