Merge branch 'v6.4.x'

Conflicts:
	src/Gauge/GaugeVario.cpp
	src/Look/Fonts.cpp