Merge pull request #116 from mne-tools/master

Update
Merge pull request #119 from mne-tools/stable

Merge pull request #116 from mne-tools/master