more test
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/wow/package/config_test.rb
merge