More parsing vulnerability upgrades.
Merge branch 'master' into memberships