Initial import from 3.5.1 tarball