rev test
Merge branch 'stable'

Conflicts:
	lib/test