Merge with latest branch of chibimagic:master