this is a very bad example of a commit. touches too many files, has no scope... should avoid this in the future!

Merge branch 'master' into 92-define-further-classes-of-processes-maintenanceprocess