Merge branch 'security-fixes'
Merge branch 'master' into security-fixes