Cleaner, but untested Tobler's law
Merge remote-tracking branch 'origin/spatial' into spatial