Trunk 3646

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