Merge remote-tracking branch 'upstream/v0.10'

Conflicts:
	deps/v8/test/cctest/test-api.cc
	lib/events.js
	lib/http.js