merge X and XRef
continuations
Merge branch 'mergerefs' into gfxinterp

Conflicts:
	tests.ml
more continuations