Merge branch 'master' of ssh://git.eclipse.org/gitroot/etrice/org.eclipse.etrice