Logging cleanup
Merge branch 'master' into 2.5.0

Conflicts:
	default.py
	service.py