openmrs/openmrs-core — pull request #816 by dmexs (2014-03-24 23:13:30+00:00)
Title: Trunk 4015

My solution to TRUNK-4015 after discussing with dkayiwa on IRC.