default units for measurement
Merge branch 'default-units'

* default-units:
  default units for measurement