Conflicts: source/core/Terminal.cpp source/core/Terminal.h Source commit: f6ca3c9f3d063f0aed483c0f2e5ffee5843ac498
Martin Prikryl