Updated to latest from the tar.gz snapshot.