Fixed fuel heuristic, removed unnecessary label update line (it wasn't doing anything) - Hutchinson
Merge origin/M6 into M6