Switch to the latest 2.1.x branch. This gives us PostgreSQL 9.3 support.
Remove patches as suggested by gdt.