Merge from pgjdbc/pgjdbc