fix crash (null pointer in make_cmd)
Merge branch 'version-3-3'

Conflicts:
	src/build.h