removed debugging
Merge branch 'master' into posgres-single-con