Upstream version 20150304
This tag has no release notes.