Upstream version 170812
This tag has no release notes.