Merge branch 'v6.4.x'

Conflicts:
	src/Renderer/TrailRenderer.cpp