This is a backport of secp256k1 PR606

Note that we already removed the sudo:false in a previous patch, so this is mostly to fix discrepencies that would cause unecessary merge conflicts.

Travis will tell us if it's unhappy. I simply assume it won't.