Pull changes from OpenMRS-Australia:master