TRUNK-1906

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