South is not required, so import in try/except
Merge branch 'develop' into feature/1_geodjango