Merge branch 'master' into distances
merge
Merge branch 'distances' of github.com:kelvich/postgresql into distances
m1