Fix GH-30; passthrough not accepting different arguments
Merge remote-tracking branch 'eproxus/master'