Cmiller

Patches submitted from Chris Miller this morning.