fix mne-x
Merge branch 'master' of https://github.com/mne-tools/mne-cpp