merge models.py updates from delayed-geo