Upstream version 20180606
This tag has no release notes.