Merge remote-tracking branch 'origin/master' into zkouskaControleru
Merge branch 'zkouskaControleru'