Upstream version 20160823
This tag has no release notes.