Fixing some more tests (GeographicArea).
Merge remote-tracking branch 'origin/master'