Merge branch 'TRUNK-3912' of https://github.com/felipeq/openmrs-core into TRUNK-3912, corrected