Trunk 3919

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