Rewording
Merge remote-tracking branch 'origin/develop' into develop
Typo
Merge branch 'develop' of github.com:roboterclubaachen/xpcc into develop