Add fixes from /u/hockeyanonymous
Merge branch '2.1_fix'

Conflicts:
	hockey.luac