Changes from master

These are changes from master which now finally find their way to spielwiese.