Conflicts: source/forms/CustomScpExplorer.cpp Source commit: ab4bfcac0c417e39d0295b827b6f606133326489
Martin Prikryl