[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2944: Merging changes from 2.0.6

revision-diff.txt (170 KB)