Pull upstream changes from openbadges-validator, node-jws