Back out migrations that depend on postgis; they're been left on branch postgis-migrations
Merge branch 'develop' into cgdevelop