Merge https://github.com/TopologyMapping/security-modules-1

[cunha]

Please merge https://github.com/TopologyMapping/security-modules-1 into this repository so we can delete it; it's somewhat confusing to have the two repos around. It seems to have several commits ahead of master, so we need to check if everything is here before deleting.