Merging in my changes over Michiyo and DrakeBD.

They committed to the wrong place.