hard merge branch db42-a

Conflicts:
	vm/compiler/codegen/Optimizer.h