Build #222:   Merge branch 'master' into travis on branch travis almost 7 years ago

Build #62:   Test for correct_waveforms with reordered stream on branch master over 9 years ago