Merged updated indentation patch from David Lamkins