re-test
added timeout
adjusted test
stabilized tests
Merge remote-tracking branch 'origin/devel' into 2.0

Conflicts:
	test/action.js
	test/async.js