Merge branch 'debug' into server-performance

Conflicts:
	db.rb
	http.rb