Initial heat hold fix
Merge branch 'heat_hold_fix' into 7.5

Conflicts:
	firmware/current_version.txt