trimmed lines to 80 chars
Merge remote-tracking branch 'origin/newargs' into newargs