fix previous commit
Merge remote-tracking branch 'upstream/master' into obspy.station