fix type for stored_drift
stored_prop -> stored_trace
Merge branch 'master' into gcd

Conflicts:
	src/utils/export_tree/TreeExportHook.cpp
	src/utils/export_tree/TreeExportHook.hpp
post-merge updates