Upstream version 161013
This tag has no release notes.