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)
commit5c594d59c6927b6374fa59e16da3830507300321
tree17ec0a2158cf2460e8f2ea3a1cf86ce87164e138
parent155502af1a45fa9474d56d4389dcba4e1e2c9f6d
parentbf7567fd2a5b0b28ab724046143c24561d38d015
Merge 17.05.1 into 17.05.x

Change-Id: I65fdca844ad178ec6e2c086d45b901df93b55e58
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>