Initial commit from 1.3.10 tarball