Cantaloupe update
Merge branch 'master' of https://github.com/anvc/scalar
Cantaloupe updates