spelling: trace -> track
Merge branch 'master' into gcd

Conflicts:
	src/utils/export_tree/TreeExportHook.cpp
	src/utils/export_tree/TreeExportHook.hpp