Bring package up to date with upstream (20130611)

Thanks to bibstha for pointing the update out to me.