Merge pull request #176 from bgamari/master

Various nightly fallout
chario: Fix import of non-existent type