Upstream version 161002
This tag has no release notes.