JLS36G

Conflicts:
	core/build_id.mk