Upstream version 20160825
This tag has no release notes.