Versionen angepasst
Merge branch 'testing' into stable