Upstream version 2.0+git20190208