Contributed plugin update
Merge branch 'contrib-upgrade'