merging in contributions from our BrainMappers

Merged Roberto José TORO OLMEDO requested to merge github/fork/katjaq/master into master

Created by: katjaq

Merge request reports