Fixes.
Connecting with clause fix (do not try to find connection automatically).
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Connecting with clause fix (do not try to find connection automatically).
  Fixes.