thread safety
Merge remote-tracking branch 'mne-tools/master'