Upstream version 0.9.1~git7ffc768