Are there options for measuring temperatures in ardupilot?

I had a flight that could have gone very badly because my motor overheated and burned. Yet, I had no idea.
I’m currently working on trying to at least get RPM working (no luck so far), but there seems to be no way to sample/save temperatures yet, is there?

Previous requests from others:
http://ardupilot.com/forum/viewtopic.php?f=41&t=14371
https://github.com/ArduPilot/ardupilot/issues/2218
http://diydrones.com/forum/topics/temperature-sensor-support-on-apm

Thanks,
Marc