merge
Merge branch 'master' of https://github.com/amonszpart/KinfuSuperRes
Merge branch 'master' of https://github.com/amonszpart/KinfuSuperRes
Merge branch 'master' of https://github.com/amonszpart/KinfuSuperRes
troll final