Merge branch 'security-summit' into 'master'