Merge branch 'insp20' of https://github.com/inspircd/inspircd into insp20