Merge branch 'metaclasses' of github.com:ramntry/generic-transformers into metaclasses

Conflicts:
	regression/test110.ml
Merge branch 'metaclasses' of github.com:ramntry/generic-transformers into metaclasses

Conflicts:
	regression/test110.ml