Turn on logging
Fix crash on read timeout
Merge branch 'master' into plugins

Conflicts:
	Dockerfile
	service/options.go