Merge pull request #1286 from bradymiller/security-fix-francisco_1