Get upstream changes

This fixes the test setup in plpydbapi