Fix bug in smooth_traces
Merge remote-tracking branch 'upstream/master'
test commit