Merge pull request #9032 from devhell/canto

canto-{curses,daemon}: {0.9.4,0.9.3} -> {0.9.6,0.9.5}