Merge branch 'master' of git.embl.de:grp-zaugg/GRaNIE

2 jobs for master in 15 seconds (queued for 25 seconds)