poprawka merga
Merge branch 'master' into kickoff