UHM-1085: Add a "Appointment Location" location tag
Merge remote-tracking branch 'origin/master'