Upstream version 20160822
This tag has no release notes.