Converting a unit without value will now result in a unit *with* value
Merge remote-tracking branch 'origin/develop' into develop
Updated history