don't use /Event for the branch names in albers
Merge remote branch 'benedikt/master'