Sorta Support for Factions 2.x
Merge remote-tracking branch 'upstream/Factions_2.x'