Merge commit '06662e7' into upstream

Conflicts:
	Makefile
	build/standalone.gypi
	build/toolchain.gypi
	src/cpu.cc
	src/d8.gyp
	src/deoptimizer.h
	src/hydrogen.cc
	src/platform-posix.cc
	src/sampler.cc
	test/cctest/test-api.cc