o
Merge branch 'fixups' of github.com:Adam-/anope into fixups