1.7.0-rc3
Properly drop postgres enums
Merge master