Merge
Merge branch 'dstufft-use-packaging'