upstream/20171104

Aleksey Kravchenko

@alexk

b99eaaec · New upstream version 20171104 · Jan 10, 2019

Imported Upstream version 20171104