Upstream version 2016.04
This tag has no release notes.