Merge branch 'master' of https://github.com/karpenoktem/kninfra
Merge remote-tracking branch 'khandhas/master'