transfer commit
auto merge

Merge branch 'beta' of github.com:TDC-bob/TDCSKI into beta