Version bumps
Merge branch 'postgres' into sqlite