update core and modules
Merge branch 'security-updates'