Merge in Faux123's msm_thermal from https://github.com/faux123/Nexus_5/commit/1b022b8898171b5c89f46b0af8b495ba93eae130