Upstream version 2.12.0~git20190903.1cdf291dc