Channel: improved default parameter handling (now merges template parameters into defaults, rather than using either/or)
Channel: improved default parameter handling (now merges template parameters into defaults, rather than using either/or)

niceandserious/crafty-vagrant,chrisdubya/crafty-vagrant,chrisdubya/crafty-vagrant,chrisdubya/crafty-vagrant,niceandserious/crafty-vagrant,niceandserious/crafty-vagrant,niceandserious/crafty-vagrant,chrisdubya/crafty-vagrant