Compat fixups
Merge branch 'master' of github.com:n13l/aaa-sec