Merge branch 'master' of gitlab.fi.muni.cz:xkucerak/kdtesting into HEAD