Merge branch 'master' into testing
Adding a topic for primitives that we'd like to move under better parents.

Fixes #316
Merge commit 'e265663eb42b450180405d469dae5d97db0c0363' into HEAD