manually adjust non-obvious cases of tab to space replacement
remove trailing \r characters
Import release snapshot.