Merge branch 'tb/delimit-pretty-trailers-args-with-comma'