Merged Master with Brian-editor