ConnectionInfo made thread-safe. Better screenshots.
Merge remote-tracking branch 'origin/master'