Gabe Wyatt:
	- Initial commit for 7.0/Legion fixes.
