[Branch ~dhis2-devs-core/dhis2/trunk] Rev 413: Fixed bug #385142