UTG

Merge commit '81e5973f7b7d85b4ed834a3132b1ec85e5638f69'

# Conflicts:
#	input-cache/txcache/EPSG-GeodeticParameterDataset.cache
#	input-cache/txcache/MSH.cache
#	input-cache/txcache/SCDHEC-GISSpatialAccuracyTiers.cache
#	input-cache/txcache/appointment-cancellation-reason.cache
#	input-cache/txcache/epsg-ca.cache
#	input-cache/txcache/epsg-crs.cache
#	input-cache/txcache/http___ncithesaurus-stage.nci.nih.gov.cache
#	input-cache/txcache/https___www.cdc.gov_nhsn_cdaportal_terminology_codesystem_hsloc.html.cache
#	input-cache/txcache/icd9cm.cache
#	input-cache/txcache/iso3166-2.cache
#	input-cache/txcache/loinc.cache
#	input-cache/txcache/naics.cache
#	input-cache/txcache/nubc-UB92.cache
#	input-cache/txcache/service-category.cache
#	input-cache/txcache/service-type.cache
#	input-cache/txcache/ucum.cache
#	input-cache/txcache/v2-0350.cache
#	input-cache/txcache/v2-0351.cache
#	input-cache/txcache/v2-0456.cache
#	input-cache/txcache/v2-0895.cache
#	input-cache/txcache/v3-ActClass.cache
#	input-cache/txcache/v3-RoleClass.cache