Steve Kamerman ad9af2884d Merged master, fixed BATS conflict vor 8 Jahren
..
ssl ad9af2884d Merged master, fixed BATS conflict vor 8 Jahren