Upstream version 20180704
This tag has no release notes.