UNITSOFMEASUREMENT-82: EDR 

Task-Url: https://java.net/jira/browse/UNITSOFMEASUREMENT-82
Merge branch 'master' of https://github.com/unitsofmeasurement/repository.git