Upstream version 0.7+git20181114