Steve Kamerman ad9af2884d Merged master, fixed BATS conflict 8 gadi atpakaļ
..
ssl ad9af2884d Merged master, fixed BATS conflict 8 gadi atpakaļ