Tagging upstream version 20160501.
This tag has no release notes.