TRUNK-3751

https://tickets.openmrs.org/browse/TRUNK-3751