Merge branch 'development' of https://github.com/open-ephys/plugin-GUI into plugin-generator-merge-with-dev