No units for zero values
Merge pull request #1023 from nschonni/remove-zero-units

No units for zero values