Merge branch 'upstream-16.11-stable' into 16.11.x 89/9789/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Fri, 8 Dec 2017 17:17:23 +0000 (17:17 +0000)
committerLuca Boccassi <luca.boccassi@gmail.com>
Fri, 8 Dec 2017 17:17:27 +0000 (17:17 +0000)
Change-Id: Ida57d6d5aedcd4fe3a504a9ced733e73deee76c5
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

Trivial merge