Back merging master changes into testing#52

aacuevas merged 2 commits intotestingopen-ephys/plugin-GUI:testingfrom

masteropen-ephys/plugin-GUI:masterCopy head branch name to clipboard