Upstream version 3.0~git20191203