I fucked up.
Merge branch 'master' into make-quantities-testable
Merge pull request #53 from eggrobin/make-quantities-testable

Make quantities testable