Merge branch 'master' into 'master'

Kokettenbeispiel repariert

See merge request !4
1 job for master in 4 minutes and 37 seconds (queued for 6 seconds)