Fix probably a bad merge.. This should be the connection object
Merge Pull Request #334 into 'next'

* pr/334:
  Fix probably a bad merge.. This should be the connection object