[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6: Merging local branch with trunk