TRUNK-2119

https://issues.openmrs.org/browse/TRUNK-2119