upstream/4.0+20061029

Yavor Doganov

@yavor-guest

95e0f516 · Import Upstream version 4.0+20061029 · Feb 12, 2018

Upstream version 4.0+20061029