Add a test case for #38
Merge branch 'stable'

Conflicts:
	test/box/configuration.test