merged from main eqemu git