Merge remote-tracking branch 'origin/master' into 4015
Conflicts:
org.fortiss.af3.component/src/org/fortiss/af3/component/utils/.ratings
Signed-off-by:
Johannes Eder <eder@fortiss.org>
Conflicts:
org.fortiss.af3.component/src/org/fortiss/af3/component/utils/.ratings
Signed-off-by:
Johannes Eder <eder@fortiss.org>