Merge branch 'master+umodes' of https://github.com/Adam-/charybdis