speedy: fix template arguments
Merge remote-tracking branch 'azatoth/master'