Merge branch 'master' of github.com:Jamyn/addon_securityadvisor