Upstream version 20180621~6979c25
This tag has no release notes.