Code formatting with the OpenEngSB formatter.
Merge remote-tracking branch 'origin/master'