[Branch ~dhis2-devs-core/dhis2/trunk] Rev 487: (GIS) Rev 485 now complete.