Added Thermal Expansion Compatibility
Merge remote-tracking branch 'upstream/master'