GeographicAreaControllerSpec changes.
Merge remote-tracking branch 'origin/scaffold' into scaffold