With quantity output, ensure non-quantity input is treated as dimensionless
Merge pull request #2571 from mhvk/quantity-output-from-non-quantity-input

With quantity output, ensure non-quantity input is treated as dimensionless