3 2 postgres patched

This brings our monkey patch to the current stable branch so I can apply it to omoikane