Merge branch 'master' of github.com:open-ephys/analysis-tools