Pass callback to hooks so that next can be skipped
Merge commit '140d67973d743b23116c86d6f061437525d9daa1' into 2.0-patched

Conflicts:
	test/hooks.test.js