Merge branch 'master' into gcd

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