Fixing crap
Merge branch 'FUBAR'

Conflicts:
	tests/gc_test_alloc.c