minor update
Merge branch 'master' into new_style_pulse_sequences