This is 2.5.0
Merge branch 'master' of https://github.com/MassiveCraft/Factions
Upstream merge