update to and merge from postgresql 9.2.4