Secure by Default

Fix #1001