Upstream version 20160619
This tag has no release notes.