Merge branch 'security-basecamp' into master