Merge pull request #930 from cgwalters/tree-wide-security-opt

Merge pull request #930 from cgwalters/tree-wide-security-opt #615