Upstream version 160919
This tag has no release notes.