merge resultserver (debug log instead of warn)
handle problems / exceptions with more logging, and less tracebacks
Merge remote-tracking branch 'remotes/upstream/development' into development