Initial import into git (Identical to my 20130220 patch).