MRG, MAINT: Fix PySurfer-related crash#7295

larsoner merged 4 commits intomne-tools:mastermne-tools/mne-python:masterfrom

larsoner:crashlarsoner/mne-python:crashCopy head branch name to clipboard