Unit expression precedence error. Fixes #667
Merge branch 'pr/1537' into rc-0.46

* pr/1537:
  Unit expression precedence error. Fixes #667